Merge from mainline.
authorKatsumi Yamaoka <yamaoka@jpl.org>
Tue, 26 Jan 2010 22:04:51 +0000 (22:04 +0000)
committerKatsumi Yamaoka <yamaoka@jpl.org>
Tue, 26 Jan 2010 22:04:51 +0000 (22:04 +0000)

Trivial merge